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

Change-Id: I25c7595608bc8a042abc9913b4e0dda00b39676f