Merge cherrypicks of [15767557, 15764320, 15764321, 15767491, 15767461, 15767298, 15767299, 15767722] into sc-d1-release

Change-Id: I00611a1a78ac3df49ab8461c40a9e47596b56b68