Merge cherrypicks of [16373492] into sc-qpr1-release.

Change-Id: I3b557f5b6b0ea9e48e0d34b9128001e475d6273e