Merge "Remove custom schema parsing in favor of Uri" into pi-dev
am: e3125c7e89

Change-Id: Ia306e77a7047d6f8bdc923cfd1ad160e4c82863c