Merge cherrypicks of [2198608] into sc-qpr3-release.

Change-Id: Iff5feb039fda41b0de99b22cb539c22030d22748