Merge "Merge "AOD: Add logging" into oc-dr1-dev am: 22b76d5deb am: dd14195538"