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

Change-Id: I90d36817c33bbca9754af7c7b9b0e3043959b475