checkstyle comment redundant import
checkstyle add newline
Merge commit '3c4998e7583f3a9b4768968043207ffc594e99d8' into dev