Merge "Factorize custom asserts."
am: 6c176efa3d

Change-Id: Ib57dfc7d7d42f8363d2b8b1d9b1a08290501ce67