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

Change-Id: I1ccf0cf773124ca669f9b11a94cd9585cd320bb0