Use BrokerApi directly instead of ExtendedBrokerApi With Gerrit v3.10 the BrokerApi includes the extra methods introduced in earlier versions as part of the ExtendedBrokerApi interface. Bug: Issue 327226782 Change-Id: Iabde315058669ec84ca86aa109c4246d58e7d5a9