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

Change-Id: I07bf6cc97a5ebeadcc82224a4d2ac6eb21b3d508