Merge cherrypicks of [12373238, 12372475, 12370691, 12373239, 12372186, 12373784, 12373477, 12373478, 12373479, 12373765, 12373526] into rvc-release

Change-Id: I9dc2e8d7e212823bab82d1909f7ec7cc7170e73f