Merge "Remove HardwarePropertiesManager usage"