Merge "Fix broken test on GSI branch"