Merge cherrypicks of [16230693, 16406360, 16304601] into sc-qpr1-release.

Change-Id: Iee3013c8772239ab24b0b765666155715eab1224