am 86bf0c7b: (-s ours) am 72a635a1: Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread

Merge commit '86bf0c7b69856124feb41fb1a938dce1f6695949'

* commit '86bf0c7b69856124feb41fb1a938dce1f6695949':
  DO NOT MERGE Add additional options and receiver to BT tests