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

Change-Id: Ia2598e532944d1d8882a8a67093de96fe27f6dc4