Change-Id: Ie8a79d9e2837842c3f60776b661cd42782b108d5
average improvement ~3x-4x moved assert to respective files Change-Id: I6c915059d456a00bdd76fab0dd2eede8b6c6ea58