Fixes: 312700921 Test: <flicker tests in presubmit> Change-Id: Ibf8b2f50eff91209bc412336d224a6283fd90a59