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

Change-Id: I5cd93d250ea8c6cd45616aaafabd0eda68da4538