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

Change-Id: Ia0fb78846c2f343d47445edb9317cf26dec2dc1f