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

This reverts commit b491b2b97bef26a0cd60727c43b38e5de74f7abc.
Rebase from 'upstream'
Trimmed the branch to only the nasa_r2_common sub directory