Merge cherrypicks of [17123090] into sc-d2-release.

Change-Id: I5455d15e52637e9ceb9dd317982cee9e326253f0