Merge "Remove PO support from HardwarePropertiesManager"