Merge "[automerger skipped] Merge "Prevent using commas in url configurations"...

Merge "[automerger skipped] Merge "Prevent using commas in url configurations" into rvc-dev am: 6ccbe373 -s ours am: d8ab35a7 -s ours am: 32cccfd1 -s ours" into rvc-qpr-dev-plus-aosp am: 7a87b08f -s ours

am skip reason: Change-Id I76a847105fc6e57542bb7b8e2dc7ce45ae8393a3 with SHA-1 05137ff6 is in history

Change-Id: I1a2625170b34bc4bb85059f1c31a1ff7ebd33702