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

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