DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4  -s ours am: 620c5cfda0 am: e286f08000
am: 1b1ea965ee

Change-Id: I607857175a10332617ffbe1a8b258c495cd7de84