Merge "AnyMotionDetector holds wakelock until conclusive. Bug: 27821976" into nyc-dev