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

Change-Id: I64de3b2ae7a975066233e49c3b8fde5e542f4f89