Merge "Revert "Refactoring AAA datastore bundles""