Merge "Fix NPE in ValueAnimator" into nyc-mr1-dev