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

Change-Id: I0485fe6cbfc6cf5e3d813ad71f181abb3bdb1637