Merge "ACTIVE->HOLD happens before HOLD->ACTIVE" into lmp-dev