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

Change-Id: Ie1279570547fe5e308778678cdcd7323b16a6a0a