Merge "Bluetooth Unit Test" into oc-mr1-dev