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

Change-Id: I5db90e1f197e8e69648ae482c708fd0a9ef29cfb