Merge "Fix Order of Operations for Converting RSSI to ASU"
am: 383624ffbf

Change-Id: I6fb88ab51db1d8034c7d3822c072683adb2c3fd6