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

Change-Id: Ib3ed1638876ff6db3555c92d71fbc4a37a74c5d8