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

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