am 2403e51c: (-s ours) am 5d05a24c: Merge "Fix wifi disable during restore" into mnc-dev

* commit '2403e51c2fba387c147e4e9a48eaa671edd4b086':