Merge "Move mtp descriptors into separate source, add tests"