trivial fix for es 2.0

Change-Id: Ifb48934e929325a0eefd3ae04a4d2bf088fa7b31
Merge topic 'es2_fix' into master

0d5d0493 trivial fix for es 2.0