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

This reverts commit 841940aa243fa216e634e721b895b1c9b38b136f.
Rebase from 'upstream'
Trimmed the branch to only the rocon_app_platform sub directory