Merge cherrypicks of [15919265, 15919266, 15919267, 15919014, 15919015, 15919110, 15919205, 15919286] into sc-d1-release

Change-Id: I65b760b0ffebbfe9bd142e0808e59b11ba63bc8a