Merge "Update dependencies for new aconfig flag storage" into main