Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970  -s ours am: 7f108b81b3 am: 4a71a2daf6
am: 0de1d85a01

Change-Id: I61273206efb364da1317666b199fda6a0ecb5c12