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

Change-Id: Ibafdbb1406b822a7e7f50ca229b8aefe9981b547