Merge cherrypicks of [15560884, 15560845, 15560903, 15560904, 15560905, 15560906, 15560769, 15560755, 15557357, 15557358] into sc-release

Change-Id: I0d3297dea2e7b755df16d443dd441cff44792f83
tree: 2e2925ffd7fd5e44e666333f5b9a3ab6fda42f7c
  1. framework/
  2. service/