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

This reverts commit 4f0af96563379e4e7599099603c21ced00d06620.
Rebase from 'upstream'
Trimmed the branch to only the access_point_control sub directory