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

Change-Id: Ib45d599b35436f9935bbb3a467b052526c670657