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

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