Make esed wait until ese_load has completed. am: 95d4103137
am: feacfd0650

Change-Id: Ieeaa65f7fe1e8b3e9c3ebdd71de9761216c39ef4