Merge "Clarify and fix the intent of the partition-type checking code." am: d0f45aa24c am: a2a6b0bfa9
am: 0ec5ce62ad

* commit '0ec5ce62ada0bfc60f1881fffe6ca59988379536':
  Clarify and fix the intent of the partition-type checking code.