Merge "Track a Java package rename in comments"
am: 5a258e72fe

Change-Id: I7fcc6eb4412868bccddefbc5bde4e292f8c525a3