Merge "Use ArrayMap instead of SparseArray to manage the ProviderKey" into sc-dev