Automatic merge from submit-queue (batch tested with PRs 40132, 39302, 40194, 40619, 40601) fix error message in TestGetAddonImage Signed-off-by: bruceauyeung <ouyang.qinhua@zte.com.cn> **What this PR does / why we need it**: 1. fix incorrect error message in TestGetAddonImage 2. rename some variables to make them more reasonable