adapt for EOS

Change-Id: Icb237102722c064986aa932c252940c6b371d909