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

Change-Id: Ib039a5e4995a293230090f02827ecaf3594044a6