Merge cherrypicks of [16334687] into sc-qpr1-release.

Change-Id: I4fa0268f4674431ca2e8ec62ff43c9312b511a54