Merge branch sc-release

Change-Id: I1463433a79e65db2d697b8f5cf61a37a75f83f7d