am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev

* commit '5d05a24cff5be83dc7b03deccfb7f52b0066b34e':
  Fix wifi disable during restore