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

Change-Id: I09ffeab660ec3317d7383c070a3767568c84fcb1