Merge cherrypicks of [16100469, 16184933, 16414971] into sc-qpr1-release.

Change-Id: Id8b92050daec05bb9f6f4a94d120af46b15ee1f1