[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: I513df8bc2733f8ee3c0c1de2a049ee7733a146ee