Merge cherrypicks of [15676045, 15677253, 15676249, 15675950, 15677460, 15678098, 15676093, 15677860] into sc-release

Change-Id: I6fdf87f2117711ef6600d0a178619b05f8c7f3a0