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

Change-Id: Ib15bb4edb49bd886a278fd18847573089298c852