Merge "Add WBS support on Bluedroid (4/6)"