Merge "[automerger skipped] Merge "Verify URI permissions in MediaMetadata" into tm-dev am: 9babf1a67a am: 83611643f2 -s ours am: e9265d45c5 -s ours am: 927bab6f06 -s ours am: a54b409aaa -s ours am: d8813a24d5 -s ours"