Merge "ART: Refactor for bugprone-argument-comment"
am: 7b97f75673

Change-Id: Ibb8106db8f5b84fb66fb3606f0e18871e0409c40