Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216 -s ours am: 5f17a285 am: 98371ee7 am: e6f60d0f am: 4a69ee91 -s ours"