Merge "Use real package name in MemoryUsageTest"