Merge "Fix test failure" into pi-dev