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