Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev
tree: f51c135cdc2e05d844cbd17afbf8d8ba3797c1f1
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING