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

Change-Id: Id17cc532cd4a0bf21f1aab7609b12618c6d67520