Merge "Fix RadioTunerTest." into pi-dev