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
am: 3c30346de2

Change-Id: Ib4bfd2cde222e01e876d9b4ffc3a2135037c860d