Merge cherrypicks of [17106446] into sc-d2-release. Change-Id: Ie163c7034773b5ea70973176d860f7dbafe4a5b7