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

Change-Id: I94befcc1256828a31740da18d533934c3eeb10ac