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

Change-Id: Idfe642323575c80b40313007328012be1f3b03a9