Merge "Merge "Fix RadioTunerTest." into pi-dev am: 1fdddabc24 am: f970cde420"