* commit 'b81ce34af33ce940846e71878279f9482037cb39': Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"
* commit 'b81ce34af33ce940846e71878279f9482037cb39': Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"