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

Change-Id: If00335a9b49d4a8ed6a609f144bc2c00b529c184