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

Change-Id: I57abb3d7f4bce7cdda696b57f65475c02ac3b498