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

Change-Id: Ice1aeff85bd52e27cc38318cb48f6648cea72f04