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

Change-Id: I521117b8c2eb6f6870c26a9adca47be46d97804d