Merge "Region: Speculative fix for ubsan abort" into pi-dev am: ab2e344ec3
am: c0b9365600

Change-Id: Ib32aa1f6c3dd371ec7f3011d7a10ed20577d123f