Merge "Renamed HARDWARE_PROPERTIES_SERVICE to hardware_properties." into nyc-dev