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