Merge "Fixed the obsolete logging" into oc-dev
am: 93c2c94c19

Change-Id: I264afd9b0f5ab4a7c1e40467c40f285749b87600