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

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