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

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