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

Change-Id: Id5be0380dcc8e3d5831afb27147b4624cee19dbb