Merge "Disable flaky flicker tests" am: e56396645b am: 29ff225c90

Change-Id: If564155af0bb2eb3790345153f8324f0f02baab1