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

This reverts commit e86a46b91be5c7920010d0da8929f845a1486869.
Rebase from 'upstream'
Trimmed the branch to only the fake_localization sub directory