am ec83457d: Merge "Support multiple condition for getDeviceOverrideValue"

* commit 'ec83457d726679e81d0b0ec12c9e7a284464133e':
  Support multiple condition for getDeviceOverrideValue