Merge "Revert "Get device_state_configuration config files from ODM partition""