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

Change-Id: Id3b379eb59bd6517d551d3b59b8f3d6386079e38