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

Change-Id: I9ef92509919fe0b44103560f2061a937fb0ed3e6