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: 5e169db6 am: cb1006a9
Change-Id: I610f7a33b4b0fa8f2536c5f80107b54c6d842d2a