Merge "Remove unused method on VersionedBroadcastListener"