Merge "Remove unnecessary line of code"