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

Change-Id: I2045dd5cfdc76b61e1989fa0e2d238c5e6affc91