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

* commit '863676ef7f30080a1b88633c7c75f71f91150dbd':
  Fix wifi disable during restore