Merge "ART: Refactor for bugprone-argument-comment"
am: 9bb9723258

Change-Id: I30419eb581735c7e20e973fbb345601f37964416