Merge "Do not access MTP devices when disabled." into nyc-mr1-dev