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

Change-Id: I4bae0639b4dc3948f50aa794f00285ffb1b5604b