Merge cherrypicks of [12815319, 12814329, 12815455, 12815417, 12814907, 12814908, 12814909, 12814910, 12814911, 12814912, 12814913, 12814914, 12815475, 12815364, 12815365, 12815366, 12815367, 12815368, 12815369, 12815370, 12815371, 12815372, 12815418] into rvc-d1-b-release

Change-Id: I2c084dd8f1e34485ad4b2fe3e7e4e8477eaa2ecf