Revert^2 "Remove base divergence"

This reverts commit b43ed43587b31801e21d24aeba8d3daefc6b60ef.

Reason for revert: Propagated the fix to udc-mainline-prod (ag/25992916)

Change-Id: I8808db2017dc3381971e71e745b6193dc5fd6b72
7 files changed