Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
am: 2d362d7159

Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405