DB/SAI: More EAI to SAI conversions.
DB/SAI: more EAI to SAI updates.
DB/SAI: More EAI to SAI
DB/SAI: More EAI to SAI updates.