Merge "Add missing cassert includes"