Merge "[automerger skipped] Merge "Check URIs in notification public version."...

Merge "[automerger skipped] Merge "Check URIs in notification public version." into rvc-dev am: 6f9b881a am: 0213c11e -s ours am: 28844062 -s ours am: 279bdb81 -s ours am: d6048ac3 -s ours am: a982233f -s ours am: 6d45646d -s ours am: 82a3a98a -s ours am: 37accb90 -s ours am: 05430e1d -s ours" into udc-qpr-dev-plus-aosp