Merge "Fixing session abandon logging bug" into oc-mr1-dev