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

Change-Id: I6d3a29bc40104f312641f79617bb3dd920fe60e1