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

Change-Id: Icd717282e22dfb01b678836f0a50eb9b56db9f0f