Merge "Fix typo in radio_metadata_t definition." am: ae770a4728 am: f9026b1059
am: b936ca317b

Change-Id: I02bd5feff9041e76e56e0a35cca94c879bb99333