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

Change-Id: Ibcc681680b9cbd55691d619e89641b97dabda6d3