Merge "Use regular check for partition name instead of CHECK()"