Merge "db845c: Wire in bluetooth support" am: 9d2903b236

Change-Id: I44b7a8d4194f2bc39471baf69c7ef602adc6a908