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

Change-Id: I51a846a54794dd694ac2f5c6e4edacf1ea5e355c