Merge "Remaster test after rs_math.rsh changes."
am: dc671e951d

* commit 'dc671e951d033cc23f4f9769de014a7fde5fa342':
  Remaster test after rs_math.rsh changes.