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

* commit 'd4c0b52e2a425dbc6e3794aae33595959453e777':
  Fix wifi disable during restore