am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via...
am 76c234c8: am d0d23c80: Merge "Fix wrong states when waking up from doze via touch" into lmp-mr1-dev
* commit '76c234c8':
Fix wrong states when waking up from doze via touch