Merge "Fix infinite loop problem in AnimationHandler" into oc-dev
am: 163ec051d1

Change-Id: I56250bcf79be21354469098598f8d3f39dc0d2de