am 2f764cb9: Merge "ACTIVE->HOLD happens before HOLD->ACTIVE" into lmp-dev

* commit '2f764cb991913fe829c7d1d5fd3aac662b76fcd7':
  ACTIVE->HOLD happens before HOLD->ACTIVE