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

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