Merge "Update Bluetooth api"
am: ff44a78145

Change-Id: Id8301ae1027dfcd5512d2a1ad8c59fd2886abc81