Revert "Trimmed the branch to only the calibration_estimation sub directory"

This reverts commit 82c8096d383d5e0df3ceb29f1d21ff420c89eb72.
Rebase from 'upstream'
Trimmed the branch to only the calibration_estimation sub directory