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

Change-Id: Ic42e3a481e6ced6a74f795118e2d576f261790cc