Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev am: 2897fd315d
am: 6857a57459

Change-Id: I51881463579f56dcb158f7bfe161343df5337f0d