Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled"
am: bd4031de4a

Change-Id: Id4a271fefdc4d56208f90d51cd434cbbbd9f9414