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

Change-Id: I1e2df685b2e5fbf3b1affc949faf1cfc0348ca9e