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

Change-Id: If0de2ec65fd7f8ee7697415ab0e5038c1811b7dd