Merge "Configstore HAL is down-revisioned to 1.0" into oc-dr1-dev