DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc  -s ours am: edb6b17ebc  -s ours am: 08bd3a75fb am: 9c441159f9 am: 2f8dbe9693
am: 3bb6994a0b  -s ours

Change-Id: I5b8a2b5df614aa4abe813e48ebf030d15dbf0202