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

Change-Id: Id17f60a556f7e3b44a438d65cff583c17617db6a