Merge "Move SingletonTest back to libutils_test"