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

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