Snap for 7599941 from bafe3db8414438763c08c4a50c9efaaf955cd4bc to sc-release

Change-Id: If0753a6ec31d64d1d7f5ca46046193a41dd0b856
tree: 1932b81d1d8141dcae5369bb9e15c2047eb5f956
  1. framework/
  2. service/