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 '401dc4117bddec60cacb2abdf9a3eb9696c1dc48':
  DO NOT MERGE: Fix leak when animations are created but never started