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

Change-Id: I89408522311bc63a4ae6caa6e7e6041d25512aa4