Merge "Restructred blob utilities to make them accessible in tests."