Merge "Newly create idmap only when it is stale" into oc-dev am: 4bf5dcce19
am: 951a77b675

Change-Id: Iaf155251ac7d62b236f356fd0f66f1f621038b9c