DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9
am: 7555eb508c

Change-Id: Ida6bf3d99469b443d6312066497ddb067569cd1d