Merge "idmap: include idmap version in check for stale file" am: 609887a980
am: a15992086c

Change-Id: Ib8510f7a156ef71926b1e3f339aa4426981d4745