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

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