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

Change-Id: I2e15595d4e8f797d5b5606a5298ac50b83cf581b