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

Change-Id: I9b9ae2ac2f877812919ca31a8968e9c505598e3a