Merge "Remove StringPrepParseException from @CorePlatformApi." am: 3f324e039c
am: 1b344fa88f

Change-Id: Ia15da5e9068b03641f6eaad816ae495dd355a07e