Merge and update diff patch from SHW-M440S Update3 Open Source