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

Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e