Merge cherrypicks of [12644580, 12644273, 12644947, 12644726, 12645141,...

Merge cherrypicks of [12644580, 12644273, 12644947, 12644726, 12645141, 12644434, 12644435, 12644436, 12644997, 12644501, 12644948, 12644998, 12644949, 12644950, 12644951, 12644952, 12644953, 12644954, 12644955, 12644502, 12645163, 12645164, 12644550, 12644551, 12644437, 12644956, 12644957, 12644958, 12644959, 12645165, 12644438, 12644439, 12644440, 12644441] into rvc-release

Change-Id: Iecb9e41fd19a37406460e643275b7229aab58afe