Merge "Revert "Clear out tuner prefs since it is disabled"" into pi-dev
am: d532ff3397

Change-Id: I8287fec3a1cc321b1c1a27046b03354725dcd2b9