am 7ed525bf: am 5ad9b395: am a44fdb9e: Merge "Don\'t skip loading object animator." into lmp-dev
automerge: 8f6e7a8

* commit '8f6e7a868ce7715184a0d9239c6a72d269083c38':
  Don't skip loading object animator.