am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for...
am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '3148557c':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()