Merge "Remove unused method on VersionedBroadcastListener" am: 536d241fb2
am: 0ce85f8c51

Change-Id: Id310aee1633c0167be297422db02d206877390eb