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

Change-Id: I3d0c489f0a6b3522f93b6d3b4db7892d081dc11c