Merge "Remove reference to internal bug number"