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

Change-Id: Ia6ffd48aeaf1b3d0de2294115d3769b82f950a51