Merge "Remove redundant final modifiers from api"