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

This reverts commit bde820c2e2e24b71c96453c2470b3e7c26f49f03.
Rebase from 'upstream'
Trimmed the branch to only the hrpsys sub directory