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

Change-Id: I833221e68e0c9f3a423b8a719b95d05afc675328
302 files changed