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

Change-Id: I905f140e2b4618a12249958ef1de0f06ce526f82