[automerger skipped] Merge "Properly initialize MotionClassifier" am: 71f70d66 am: e66b15ab -s ours
am skip reason: Change-Id Ic76b82bd5f2cd374e3b001400eb495ca36de7353 with SHA-1 958c4d07 is in history
Change-Id: I73baf45ff3a71a18a4542efd4740375b2309239f