Merge "Remove "@author Aaron Schulz" annotations"