Merge "Bluetooth Unit Test"
am: e95b2eb678

Change-Id: I9961bb26a7b0cd35911cb9aaf92c3b28b406f258