Update Math to master

Change-Id: I500bebfd11905042307dfa3b54a8032b1e1a2c46