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

Change-Id: Ia21238dcf80faf4f0b9196a9fdb46cefecdd9ae2