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

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