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

Change-Id: I0fef13605c0a2da1b787bc11ac4ec06926665ba2