am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

* commit '180a30aa57e0790453944533dc442704f7596f65':
  Remove CONNECTIVITY_CHANGE_DELAY and friends.