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

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