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

* commit '1e05bc6f77b9e609df598ef0aed20a0ef81848a1':
  Fix wifi disable during restore