Merge "sdm: Populate correct WB index for virtual" into dev-1.0