Merge "aflags: remove unnecessary String conversions" into main