am bd73c736: (-s ours) am 1acfef82: merge from gingerbread

* commit 'bd73c73666e906bca888fb3d206a1b5a583e8447':
  Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)