Merge cherrypicks of [12350857, 12350967, 12350494, 12350813, 12350814, 12350816, 12350695, 12350858, 12350984, 12350985, 12350908, 12350696, 12350697, 12350909, 12350859, 12350860, 12350861, 12350910, 12350564, 12351002, 12350817] into rvc-d1-release

Change-Id: I769e90b7a0f817fa6e3caf4dff645f2a50007834