Merge changes I41372c25,I4472e23a

* changes:
  Add support for sensor conditions in device state configuration file.
  Update DeviceStateProviderImpl to read from device state config file.