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

This reverts commit 26850efe29aadb6d12bd1e81a8f11e112e67372e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the neo_platformctrl_diff sub directory