[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 am: bbb9ea20 -s ours
am skip reason: Change-Id Ib9c25b43a52963e4222de8152c47c9eb26227e65 with SHA-1 24820991 is in history
Change-Id: If45106033a0b619ac92b32265d13c661c494b5a4