Change-Id: Iea5a07e10712723970a15008eb367e0af226fcc3
Adjust use in ApiBase. Depends-On: I9a172b2bd922c3a62248545906bd9bdfcac03a43 Change-Id: Ie5485b1df9f3886add943ddcf8b0824e87a7f3e4