Merge "Fix building error for multi-line dontaudit statement"