Merge "Do not access MTP devices when disabled." into nyc-mr1-dev am: a40092d6d2
am: d22a1d66d8

Change-Id: I5669f78107fba42ee1d332d504b4c077c39bba2c