Merge 297fd603 on remote branch

Change-Id: I54a5e6c00426bd5070f4996a5fc95cc0647c3f50

system.prop

@@ -123,9 +123,6 @@ ro.qc.sdk.audio.ssr=false
 
 ##fluencetype can be "fluence" or "fluencepro" or "none"
 ro.qc.sdk.audio.fluencetype=none
-persist.audio.fluence.voicecall=true
-persist.audio.fluence.voicerec=false
-persist.audio.fluence.speaker=true
 
 #system prop for RmNet Data
 persist.rmnet.data.enable=true