Merge "Track a Java package rename in comments"