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

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