am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1

* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
  Clarify rules about encryption of emulated storage.