Merge cherrypicks of [16622627, 16790556] into sc-platform-release.

Change-Id: Ie4c9ef1d90cbbe0784c56d55130f925cb1910094