Merge cherrypicks of [16331586] into sc-qpr1-d-release.

Change-Id: I79890d9c1e0bd61a89103bd9e10cc91602bd2e98