Merge "Remove stale string" into pi-dev