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

Change-Id: I3e78ede76656eff16fce54808a052ab79105ae79