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

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