Merge "Layer: Guard against Region offset overflows am: 33da946835 am: aa2c811131" into tm-d1-dev-plus-aosp