Fixing rebase issues after integrating with wmi v2 implementation.