am 5e1b2395: am 298eb3cb: am 49982a1f: Merge "Fix AnimationUtilsTest failure due to the timing dependency" * commit '5e1b2395': Fix AnimationUtilsTest failure due to the timing dependency