DB/SAI: More EAI to SAI updates.
DB/SAI: More EAI to SAI updates. 199 left :)