Merge "Remove unused string." into pi-dev