am ce6d3ed6: am 6f0a36e6: Merge "Enforce READ_EXTERNAL_STORAGE on emulator." into jb-mr2-dev

* commit 'ce6d3ed6120e79d7a663dac3a5aa1ffe02a6a23e':
  Enforce READ_EXTERNAL_STORAGE on emulator.