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

Change-Id: I12fce45b356d85b8c101dae8b8bed9ec84554da5