Merge "Removed useless curly braces around statement and useless return keyword"