DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc  -s ours
am: edb6b17ebc  -s ours

Change-Id: Ie31aff669dfbabd860c123d4448362af4903973d