Merge "DO NOT MERGE Add additional options and receiver to BT tests" into gingerbread