Merge "AOD: Add logging" into oc-dr1-dev