Merge \\"Wakelock timeout for AnyMotionDetector. Bug: 29959125\\" into nyc-mr1-dev am: 33759a993d
am: ef759ca10e

Change-Id: Id0f533b0a913633b364a200832518f3535da856e