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

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