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

Change-Id: If180606978a78099704be56e1e6329a87a716f58