am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev

* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController