Merge "Some clean-up of divider code in preparation for bugfixes" into rvc-dev am: fcebe7dc6c am: 401ecbc0db

Change-Id: I11e79d43cd4d3cc8b172b083afbfe8890c8b56ae