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

Change-Id: I02797a81fba2908443fe8dd6f87f1dc0df1d4044