Revert "temporarily removing es1007 and es1010 for reboots"

This reverts commit 2bc53ebbd6c5c9bd7af2e8e0043aab556b5ab1cf

Change-Id: I0c1bbdbfce6011c6b994e152b9e55af7c831c8dd