Fixed lint errors.
Merge with existing source.
Merge with existing.