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

Change-Id: I79f547b4c1e1ad1540afafe8503f6482d6d06fec