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

Change-Id: I69fef0cb9fa66509b4093e14ca1b6e5ec6d69345