am 3505ad1a: (-s ours) am 9f67b025: (-s ours) 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 '3505ad1af337f4f23eb517c89ed6ce9309be92df':