DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06 -s ours am: edb6b17e -s ours am: 08bd3a75 am: 9c441159 Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc