Changes for dea_next.

Change-Id: Ia88865b1543d06bddbe97d13e3affe51bd7a321d