[automerger skipped] Merge "Fix idmap2 uninitialized variables" am: 6982a7dc69 am: 402f9f7358 -s ours
am skip reason: Change-Id Ic9dbd3e9a768beb39ac677ff294b0fca5ee8f9d2 with SHA-1 dd63e5d256 is in history
Change-Id: If8efad357cd5482706c8016c4daac34bb6600e70
This commit is contained in: