Merge "Use regular check for partition name instead of CHECK()" am: 76cb4eeda6 am: cd66e52573 am: 705a4d72c8
am: 8dcbd1b399

Change-Id: If34784728cdb15d0ffbcd574d8032eb2715b2262