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

Change-Id: Id08e485ac5e420941453964faf1dc56deb9162c3