am a710c500: Merge "Fix failures after div support."

* commit 'a710c50023cd343d1cf765069426f678cee19eb7':
  Fix failures after div support.