Merge cherrypicks of [16042083, 16041260, 16042228, 16042360] into sc-qpr1-release

Change-Id: I7fcf031befced6560b2b51832a02d242315e552f