Merge "Address missed comments from ag/20198235"