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

Change-Id: Ibae98d58f8f48259c71dd50df319ef682b43b998