Merge "fix(plat/arm): fix a VERBOSE trace" into integration