DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54  -s ours
am: ba1f2d2571

Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5