Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
am: 78af0424fe

Change-Id: Ie176c340d3be10f6173fdc23c899c797197a918e