Merge cherrypicks of [15750529, 15750548, 15750351, 15750587, 15750549, 15750550, 15750473, 15750474, 15750475, 15741570, 15741571, 15741572, 15741573, 15741574, 15741575] into sc-d1-release

Change-Id: Ia604adf081b3e313ff27c6f4e119718e2196a343