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

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