Make check less odd

Change-Id: I29fc0f15fb0c1c63fd44f77d34a0a2dc87f8d211
Merge "Make check less odd"