Update Math for cherry-picks

Change-Id: Id7af92c0606215ea3c1d00c566467d931efff8d2