Avoid JS deprecation notices

Change-Id: I3aa12af75c019c367ccfb2d1ac9edce80e26869b
Merge "Avoid JS deprecation notices"