Update ES2 mustpass based on latest feedback

Change-Id: Ia640c6bd001165099d1ec6af20739871e654a0e1
3 files changed