Merge "db845c: Wire in bluetooth support"