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

Change-Id: I7bef390e105440a0512c8ad2e1a9f41c6557bfbb