merge_pr_8584
These clean ups are split out from https://crrev.com/c/788217: - Defining the assert failure messages Change-Id: I74ba2bb70e907a28292301046a7433480ab669d8
These clean ups are split out from https://crrev.com/c/788217: - Defining the assert failure messages Change-Id: I74ba2bb70e907a28292301046a7433480ab669d8