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