[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 am: d9a83a6e am: 449ab0c3 -s ours
am skip reason: Change-Id Ib9c25b43a52963e4222de8152c47c9eb26227e65 with SHA-1 91f0b5b4 is in history
Change-Id: I1f55596208aebe5d91096145da4f8dccd4ec30d2