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

Change-Id: I57c3b7ab138f28bd8e74c039740f21bcd4376b73