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

Change-Id: I93ce23ee4d45491a79346d11aed2cdb0fed0ef9f