Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev