Merge "Added null check while fetching the context URI resource" into udc-dev