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

Change-Id: I44390a58e2328a4bee47d6454492c76184f7098d