Merge cherrypicks of [16191708] into sc-qpr1-d-release.

Change-Id: I71fbaad5cb9b1049c7130d6aa2802cde25316d08