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

Change-Id: Ibe9348043dafcc99f21aec5f283ce8deef0802bc