Merge "Reduce the number of rotations of flicker tests" am: b6d051c228 am: 77f788067d am: 425a97149a

Change-Id: Ie7551934d419d5c9ca102e0b5b86f28a7c8f2b97