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

Change-Id: I28fbfda37088bb1801396d62e184afa6ddf2ae43