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

* commit 'bba876e9ebcaa87fe07196f06bff3e2da8e01626':