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

Change-Id: I2c24f183d60d14f3cce461954a132301146ed1ef