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