Merge "Add missing aai canonical logging"