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

Change-Id: I68f58ab193230b78363aaf54e437613f4bced65f