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

Change-Id: Ia5455efc69556e5a52b1cc945e99b2ef51fdcd23