Merge "Add bluetooth module" am: 31c1fdbc23 am: d58389b60c

Change-Id: I81f73cf9b392775679d202810b16235113978fbd