Merge cherrypicks of [16206382] into sc-qpr1-release. Change-Id: Ic98d8ffd76b58d79c3d94f81698a6896db753c0d