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

Change-Id: I83aa3ec0de6eaf637a077d0d226a772eedfba53b