Merge "Renamed hardwareproperties to hardware_properties" into nyc-dev