Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194
am: 8bfef31ce0

Change-Id: I79106ed066b76f9597d74e56498fa3a9c6258f7f