[automerger skipped] Merge "Add test to verify make urls configuration" into...
[automerger skipped] Merge "Add test to verify make urls configuration" into rvc-dev am: 858f64b4 -s ours am: 753e528d -s ours
am skip reason: Change-Id Ib9c25b43a52963e4222de8152c47c9eb26227e65 with SHA-1 24820991 is in history
Change-Id: I34e741c803441b451fe195a5e1ce17912470cef4