this fixes the Math test and is needed for further Flow updates

Change-Id: Ibf84650c71f7363aab863ab5c70c71823eb3af55
Merge "this fixes the Math test and is needed for further Flow updates"