Merge "mako: update BT product name" into jb-mr1-dev