DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76 am: d20cad62 am: e62d4799 -s ours am: e9d2113a am: 88606248 Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17