am d21c44ae: am 1a13fcb0: am 144341e8: am 9583b5a9: Merge "Fixed a bug where the QS could get stuck" into lmp-dev

* commit 'd21c44aeccbdc8891c67f0eecc40f55c6f2503b7':
  Fixed a bug where the QS could get stuck