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

Change-Id: Ibeb55f3d4b7c10b1d192bbea06ce293509e695bb