Merge "Remove unnecessary 'return' statements"