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

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