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

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