Merge "Move mtp descriptors into separate source, add tests"
am: 729f6f6018

Change-Id: I61ee4b4da3bc4b971f5786fb84794b94fae5421d