Merge cherrypicks of [15548052, 15548053, 15548731, 15548784, 15548801, 15548711, 15548732, 15548733] into sc-release

Change-Id: I4c3b476591fbb89c30f28825c38941b02e3386cc