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

* commit 'c22d145a9f26314e23ea678e96766755268e878b':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()