Merge cherrypicks of [15679207, 15679169, 15679170, 15679208, 15679209, 15679262, 15679171, 15679210, 15679244, 15679211, 15679245, 15679246, 15679212, 15679213, 15678855, 15679214, 15679215] into sc-d1-release

Change-Id: Ib1b02470ae2322b231a6b15dcdc5fbe909b19e4e