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