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

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