Merge "Bug 1306: Fixed incorrect AD/MD-SAL flow conversion."