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

Change-Id: Idc6aeabc4d88adee6dc1c64eeb3648bb42e5f2fc