Merge "Use const refs to strings in PropertyProvider" into udc-dev