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

Change-Id: Ie6fd2346535c3390697c6261bad51953ba0595b7