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

Change-Id: I63e7dff5511e9e09acf549f326d16b0670858aef