Merge "sdm: Donot override flush for virtual interface" into dev-2.0