Merge "Clarify and fix the intent of the partition-type checking code." am:...
Merge "Clarify and fix the intent of the partition-type checking code." am: d0f45aa2 am: a2a6b0bf
am: 0ec5ce62
* commit '0ec5ce62':
Clarify and fix the intent of the partition-type checking code.