Merge changes I9bf21cc6,Iee45a465

* changes:
  Revert "Revert "Add support for Choreographer animations""
  Add ability to promote fields.