am 1d562437: (-s ours) am 5e9680e9: (-s ours) am d53e22d2: am 4d3f022c: Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit '1d56243748aec4c854bd79d5963b2217d14d591e':