[automerger skipped] Merge "Enable CB module by default" am: c2911acc am: 0fdac367 am: 17e8216e -s ours
am skip reason: Change-Id Ia627dd8add639e32732e9f24ef0bee34bcdf1ea4 with SHA-1 7c84f148 is in history
Change-Id: Iad1db0965d6986659e0d6377ad97fd2a5bc3dc0b