DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746 am: 7555eb50 am: 5d60a49d am: 8916c30c -s ours am: ba1f2d25 Change-Id: Ie72b8e52cd8717ac87d90627c1f53cbe2261c5e5