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

Change-Id: I5cd1c506674a91ff9d0da784ae5cde57cfb2ef0a