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: e68565b630

Change-Id: I5bb8f3b3bd5200b88a17fa4f090ee432c7ab5b52