Merge "Fix ProviderTestCase2 broken by ag/519661:" into lmp-dev