resolve merge conflicts of 546e2e895fc46b32101bd468c516ad3bf7bcac39 to sc-dev

Bug: None, merge conflict
Change-Id: Id07440d6a55111a1a7ddbf3df306f4466073fd1d
tree: 3e4174a45b2406eed358012cc8e737d8f1264f9a
  1. framework/
  2. service/
  3. OWNERS