[automerger skipped] Properly initialize MotionClassifier am: 958c4d078d -s ours

am skip reason: Change-Id Ic76b82bd5f2cd374e3b001400eb495ca36de7353 with SHA-1 1652397ab7 is in history

Change-Id: I1c15782ad36d8af62e5d08a04cca9a5ea5f1fd2a