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

Change-Id: I1b466f0dc33487e3642d2b78683bd95dff599fb1