Merge "Fixing session abandon logging bug" into oc-mr1-dev
am: 4fce88dd4d

Change-Id: I76efdf2d4878e72c2610d7f40fef98e39dfca7a1