am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev

* commit '81aef807d5f1e3e3b5eda1162829e666c295f352':
  Improve doze transitions