Merge cherrypicks of [16484570] into sc-qpr1-release.

Change-Id: I8b3e361838f1198574f71a2292d3b229927bee81