[automerger skipped] Merge "Add bluetooth module" am: 31c1fdbc am:...
[automerger skipped] Merge "Add bluetooth module" am: 31c1fdbc am: d58389b6 am: f7ad3e22 -s ours
am skip reason: Change-Id I2a4b2ef3370dde416691a54e848c6a15fd3a0204 with SHA-1 100d2b65 is in history
Change-Id: I742b3018b35575a4fac7e829d68aaa7be7c40f33