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

Change-Id: I8774ea64f004999ddb46223a76a671388687d455