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

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