Merge "Revert "Fix math.rs"" am: 4205ce7fcc am: e053434a15 Change-Id: Ieef274be260bd76e63e805d0f8d9a2c098cfbb47