Merge "Remove "@author Bryan Davis" and "Brad Jorsch" annotations"