Merge "Newly create idmap only when it is outdated" into oc-dev am: bb54a7df3a
am: b148c4ba6b

Change-Id: I7018b71e8a710580822095c0b87853e0f877ecd8