am 1acfef82: merge from gingerbread

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