More dea staging changes

Change-Id: I5ca45ad40b7a4a1ac1bd8e527d3cceba999fd72c