am 3565b6f0: am f95a9fe5: Merge "Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)" into lmp-mr1-dev

* commit '3565b6f051f0ed4fe7dd342454a7228be7b40218':
  Fixing high cpu usage due to case not falling through to wait logic. (Bug 18390735)