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

Change-Id: I736829b4821559bd2ab4e1cc7436cc9859fabe69