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

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

Change-Id: I0eb15b8880cb3a75e6f85ad6e26f16fbfe92fcc8