Merge "Update radio buttons to use AVD"