Merge cherrypicks of [16066342, 16067131, 16067132, 16067098, 16067099, 16067100, 16067101, 16067102] into sc-qpr1-release

Change-Id: I2ea689bdb16fa799424ea430883556d5bf31b27a