Merge cherrypicks of [9739600, 9739601, 9739602, 9739716, 9739717] into rvc-release

Change-Id: Ic920640d9bd72fc2fbb0cafa08b93df75433914d