Merge "Configstore HAL is down-revisioned to 1.0" into oc-dr1-dev am: 58599633fe  -s ours
am: bd03036d86  -s ours

Change-Id: I155e433cd5f845ccb439456fafd0bb8d7ce56c4c