Merge cherrypicks of [16357746] into sc-qpr1-d-release.

Change-Id: I7b63ae6f2c04b8536349a44ed9444a56e2febea9