Merge "Add Location related Attributes." into udc-dev