Patch merge request for STE Snowball build failure on linux-arm-soc-for-next.