Merge "Fix issue that Wifi Wake is not enabled in boot sequence"