Merge cherrypicks of [15903372, 15903387, 15903254, 15903325, 15903326, 15903407, 15903408, 15903005] into sc-d1-release

Change-Id: I231be43008029951f9ac4e9d85299098dd92e150