Merge "Fix checkstyle errors in SystemMemoryTest"