Merge "On U+ require config_networkWakeupPacketMark/Mask to be 0x80000000"