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

Change-Id: I7f580393d3eb044f69b9017c7528dd4e19a35aba