Merge "Update Bluetooth api" am: ff44a78145 am: 027a9244f1

Change-Id: I20311badde6c4335d407be7724d35bb7a6a95591