Merge "Fixed default values for Bluetooth energy calculations" am: 7c45962abd am: 3f49d1dcef
am: 3b23d171eb

Change-Id: I19c20b9d16b7f07e0ccf45e007d7e8c40d191cb8