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

Change-Id: Ia4c814d67aff345889b288dac98c1880ff76e659