am 9410c3b9: am 166f0aac: Merge "Test new READ/WRITE_EXTERNAL_STORAGE behavior." into klp-dev

* commit '9410c3b924943e9e6da633939a45c462c2de4954':
  Test new READ/WRITE_EXTERNAL_STORAGE behavior.