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 'cd3b8ccf020ce1ed27d5983a8ce9d40fe1327a02':