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

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