switched urls mapping order

Change-Id: Id7896ea93f4f98423ade4f6aa95ea4ac3c0767c6
Merge "switched urls mapping order"