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 am: 73a4e88df8 am: 832890f6e2 am: 34e4628cfb am: 76d9732106 am: af70ac2914  -s ours
am: 571c8a4507

Change-Id: Ie4e871d2017d505461027c376946e2034105062a