am ba541fd0: am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev automerge: 358aed4

* commit 'ba541fd0c2bde5717586e5b0c80f6f0e24e95332':
  Improve doze transitions