Merge "Remove java-symbol for deleted string." into pi-dev