adapt for EOS

Change-Id: I0251d339d767c350e152050c44249a09cd526b31