Merge "Fixed improper capitalization related to trademark term in BT" into lmp-mr1-dev