Merge "Replace assertGreaterEqual with assertNotEmpty"