Merge cherrypicks of [15987115, 15989006, 15987766, 15989947] into sc-d1-release

Change-Id: I44544bc4c6b132b47ac5f00dbff5af1daf2dfc91