Merge "Automatically clean up flicker test data" am: d915fc7025
am: ade366490a

Change-Id: Ic54a3ac9393c9ac613558f3ce3829140828f3629