Merge "Fix assertion failures under DISABLE_NDEBUG"