Update Math for cherry-picks

Change-Id: Ib4aaaf8d9119d4786fb875e231b8c8b13b79ce8f