Merge "Delete unused PeopleHub code" into tm-qpr-dev