am cc364275: am cd3b8ccf: am 401dc411: (-s ours) am 4d3f022c: (-s ours) Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose

* commit 'cc364275bf9c4f268a7df34f86c7b75f129b5b8f':