Merge "ART: Refactor for bugprone-argument-comment"
am: 90793b3f3f

Change-Id: I5037a1e64e51d88848005842a9bdbbbc51654365