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