Merge "Remove the "needs_erase" workaround."
am: bd7b2dcaca

Change-Id: I51f83909de7ef6ddcca0182be372a9b1f7af22b2