am 4d9431ab: Merge "Fix network reload when config is restored" into jb-mr2-dev

* commit '4d9431ab35c0a8bff8d1e05aa0148aea5ccdbc2f':
  Fix network reload when config is restored