Merge "Configstore HAL is down-revisioned to 1.0"