Merge "Some clean-up of divider code in preparation for bugfixes" into rvc-dev...
Merge "Some clean-up of divider code in preparation for bugfixes" into rvc-dev am: fcebe7dc am: 401ecbc0 am: 1d3d5f57
Change-Id: I95546f40469db13402bb8addc838b29374a7c577