Merge "Properly initialize MotionClassifier" am: 71f70d667a

Change-Id: Iba4b10186626e370f18e573f791a95158f135895