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

Change-Id: Ide1d32462c549386f9867f7992bd3f1e81961e4b