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

Change-Id: I1a2be40c54e4025d4c160e2f6beaa61aa1eb51db