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

Change-Id: I245865e6a54a0468b19404094ab718f410e4ad31