Merge cherrypicks of [12039634, 12039691, 12039912, 12040161, 12040181, 12039913, 12036010] into rvc-release

Change-Id: I5e0863af7bed4108715c1a3dd2cf3e3fa6aa2768