repool es1004, es1007, es1010

Change-Id: I3176c0e1dec60b7050c8b97b1aaa9b944a66d7ac