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

Change-Id: Id4cf744015e261b2e0c62ca0a8087c8dcc58df24