Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev