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

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