Merge "Merge "idmap: include idmap version in check for stale file" am: 609887a980 am: a15992086c am: d7f3a7b095" into oc-mr1-dev-plus-aosp