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

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