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

Change-Id: Ia9e211300173e81c4d64785e19e31c3d0c7344d9