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

Change-Id: I4cb328300795db2c02b5d4ab01f5e4c4aecd0117