Merge "Only protect cleared regions for target builds"