Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread