Fix BVT for ea-1254 branch

This change has fixed the BVT for trunk-ring3.