Merge "Enhancement+Cleanup of RadioInfo Test Menu"