Fix for random causing flicker.

Change-Id: I2429e18b7f68e6708c5897fed8501f7170c78634
Merge "Fix for random causing flicker."