Merge "apexd_session - fix bugprone-branch-clone warning" into rvc-dev