Workaround for OOJS ES3 incompatibility

Depends on I6cd13b4f3a72378eb27e3aaa313511ffb20227c3

Change-Id: Ia642bbd29d3cd239f1d4b56463a1d8efe4670793
Merge "Workaround for OOJS ES3 incompatibility"