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

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