Merge cherrypicks of [17904388] into sc-qpr3-release.

Change-Id: I0049c93455df0d9d3924b06ab84bc623c571b56d