Merge "Protect cleared regions" am: 5cc179c685
am: ddeb15fec8

Change-Id: I59871ded16ced41d3a1626a07a9b4584141496cc