[automerger skipped] Merge "MAP: Add developer option to control map version"...
[automerger skipped] Merge "MAP: Add developer option to control map version" am: a24f03d5 am: d8e0b57e am: d0401b18 -s ours
am skip reason: Change-Id If32db03072e02b7b2477c7da943b6b0e6a9be260 with SHA-1 da1ca35d is in history
Change-Id: Ia648ae1e6bfd2c78504d0a0934e975037cf49c3d