Merge "Unsigned Integer Overflow in InitSegmentBitfield()" am: 4899e80a17
am: ca0d8e7461

Change-Id: Ia4e0396a4df14d667f80aded10631815b715e2c2