Merge cherrypicks of [13350919, 13351137, 13351103, 13350944, 13351985, 13351986, 13351113, 13351104] into rvc-qpr2-release

Change-Id: Id4cb6341f153533c801a88fb13623758fd10f571