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

Change-Id: I63c8ad050330dd4e938388d03fa9cf270b108e56