Merge "Reduce the number of rotations of flicker tests" am: b6d051c228

Change-Id: I04c4587ecd3d7406c95f5a177356fa1a6b3763d0