Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev