Merge "Protect cleared regions"
am: 5cc179c685

Change-Id: I954435e91061b9fbdefea591e38c2fa628bd5d9d