Merge "Fix idmap2 uninitialized variables" am: 6982a7dc69

Change-Id: If120ed5b4deb24b8b6e5a90ddcec986365736545