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

Change-Id: I16627f67138aa3fbd36ac3d668cc55e9ee89dfef