Merge "Factorize custom asserts." am: 6c176efa3d
am: 99fbb40990

Change-Id: I65ea7497abb8b77ebd10ba622075ef3b6c49b2a8
tree: efe7baf40b8c3c5d720e566d63fdfbb0f9b729b6
  1. core/
  2. services/
  3. tests/