Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev