Merge "Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev am: 2c25615224 am: f8084a33b4"