Merge "plat/st: Fix incorrect return value" into integration