Merge "Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de am: 2fb54515 am: b39a419f"