Merge cherrypicks of [18231932, 18699572] into sc-qpr3-release.

Change-Id: I597da85d7f69b17a57970fbbf1456ede8d49d767