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

Change-Id: Ib7adc4414b8fe7ef2120029b5c15e34cf07ee908