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

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