Merge "sysupgrade: Avoid dereferencing of buffer to fix KW issue."