Revert "Remove base divergence"

This reverts commit 781c3491f71788b190daf42f6c631bdc9fa935b2.

Reason for revert: b/321765622

Change-Id: Iad009b6b69b05ee4e4183c880beb62f5b9b24c6d
7 files changed