Merge "Continue the fwaas decoupling and cleanup"