Merge "ARI: Run 'make ari-stubs'"