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

Change-Id: Ie90be956ab6e52602ee72fa224ef471bb7bade38