Merge "ART: Refactor for bugprone-argument-comment"