Merge cherrypicks of [16166970] into sc-qpr1-release.

Change-Id: Icaba74b8fbd13ea93128a3e8d9186deb11af81f3