Merge "Add more const to 'instances' in registerAccessorProvider" into main