DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7 am: 901c587c6b am: 1455bd6492  -s ours
am: 7f00f14d81

Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf