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

Change-Id: I435052c1971a98b9e28bf3b018bd861c0f56f410