am 13b2497b: am 5c4be30a: am 6aa73cf2: Merge "Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)" into lmp-mr1-dev

* commit '13b2497b62ecb51b37515d65e3f29f191d457505':
  Tweaking animation XMLs and removing dead code. (Bug 17672056, Bug 18415217)