Update Math to master

Change-Id: Ia5cd233f52c2eb1afd3da67f2dbbca0417ddb57b