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

Change-Id: I3cac6098593b9fdf7db5ab6e9e8b776c9ab36d72