Merge "Remove erroneous override of package-private method."