Merge "Add some logging for buggy calls to AM" into oc-dev