DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7
am: 8860624853

Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17