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

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