Minor compile fix for ES

Change-Id: I171ac053ddb5198f6b647c5b5ab91c4456f9a1d0
Merge topic 'minor_es2_fix' into master

aca55423 Minor compile fix for ES