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

Change-Id: Ic48f62657c0bc4f6e737905aa433a408c956c127