Merge "Remove dependencies on controller APIs" into stable/neon