Merge "Improve ValueAnimatorTest Reliability" into jb-dev