Fixed AndroidBaseManagers being out-of-sync