prepare es1005 for upgrade, part 2

Change-Id: I166f0d3d2bd8fce626217e8c0644b4b71497d245