am 9f67b025: 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 '9f67b0255760fb20ab1eb2b5ddf3f9085d2f1203':