Merge \"Track the name change for wipe_ab.\" into nyc-mr1-dev
am: 943f19868a

Change-Id: I1e760f39750b1decdb8a13a7697a82e845027036