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

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