Merge cherrypicks of [16061618, 16099517, 16093937, 16144999] into sc-qpr1-release.

Change-Id: Ief49976e9d02a64fcc9987a2fa9c8cc9fe0d739c