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

Change-Id: Id2e9099d83b0d3e446c1e3941990486f22e4fe53