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

Change-Id: I0ac3376136ceeebb2b9df86c0868cd649797bd71