Merge cherrypicks of [16433656] into sc-qpr1-release. Change-Id: I13c4308b44c844eeb01e91c5cd68f403fcf5cd6d