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

Change-Id: I100008fdd7cde944b0ab40c39dfbbfb28e3b3516