Merge "MAP: Add developer option to control map version" am: a24f03d58e am: d8e0b57e3a

Change-Id: I91537221abd287ca66fbc5b1d945b8a464b3e3de