Merge "Bug 5527 - Testing - Provider"