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

Change-Id: I651fbbb7085ca89a7097aff3ca5d8cddac12c17f