Merge cherrypicks of [16381824, 16379730] into sc-qpr1-d-release.

Change-Id: I44a073b8784214272ac18a39ce9e9aa9a44fd435