Merge "Only protect cleared regions for target builds"
am: 6cb5ae065a

Change-Id: I50ce8867c7c557f5500a319828513cf8f8559cf4