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

Change-Id: I478d38cf4681fd45b094fdad6f1e9df5ecd17b37