Merge "Update packages to not depend on maps SDK v1." into rvc-dev am: eb354ce7 am: 0c5b3aa2 am: e66b2e8c Change-Id: Icf5e7dc8b49cd9aa67bca2a8d70d9772c593c858