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

Change-Id: I7c0b717df15648a217badd7a745680792bbb4539