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

Change-Id: I27f73478e86a9ba1b79e1871a5b75674bc9be7b0