Merge "Fix ExtraText lint errors"