Merge "Fix robotest failure" into pi-dev