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

This reverts commit 8e5ea15960cad477eb134c999438fdbe10554157.
Rebase from 'upstream'
Trimmed the branch to only the people_tracking_filter sub directory