Merge cherrypicks of [13391650, 13391541, 13390384, 13391212, 13390778] into rvc-qpr2-release

Change-Id: I32c312245b37511572f0a4313f83de087ccdb816