Merge "Remove meaningless "const" from return types."