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

This reverts commit 032c9a65142414bc4ec39caab9d2f6ec718e2c99.
Rebase from 'upstream'
Trimmed the branch to only the hironx_calibration sub directory