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

Change-Id: Id104c8276d8d9e12d8dae95222fbdba12023ed76