Merge "DO NOT MERGE: Fix NullPointerException in MtpManager." into nyc-mr1-dev am: dd443a0548 am: a8f55f354d
am: b233343bd1  -s ours

Change-Id: Ied78eaf667348a3fa49bfd34f0e9770e6a8a70b6