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