Merge "Fix NullPointerException in MtpManager."