Adapt to latest changes of math plugin.

Change-Id: I5927114d0216c8b963acf19d05cb721dc31699fb