Update Math extension for cherry-pick

Change-Id: Idc26c4f4bfbda8f960f829a930df9e0785760bab
Merge "Update Math extension for cherry-pick" into wmf/1.23wmf19