Merge "Bug 5596 Singleton API test"