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

Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46