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

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