Merge cherrypicks of [18167896] into sc-qpr3-release.

Change-Id: Ibcebabbead4b3baa82f3b5b905a0a4230c7b7059