Merge "Remove java-symbol for deleted string." into pi-dev
am: 82a938c149

Change-Id: Ib3af18027bbcf2d2043aa881d9a840818470e5ff