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

* commit 'bafd663fcdd36042e2340efed835d3fb6d76e3dd':
  Fix network reload when config is restored