Merge changes from topic "am-8538cb9267e14b0587f7d5d629882621"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Verify URI permissions in MediaMetadata" into tm-dev am: ad697c41 am: 9d18fc95 -s ours am: 8a246404 -s ours am: d3fe488a -s ours am: c2f19b0f -s ours am: d7d95e38 -s ours
  [automerger skipped] DO NOT MERGE am: 277e7e05 am: 03d9c073 -s ours am: b2461a72 -s ours am: ac6d153b -s ours am: ad0e8a77 -s ours am: b018d616 -s ours