Merge "Merge NoSuchProviderException from expected_upstream branch"