Merge "Use the new radio_metadata wrapper for safer memory management." am: a9ed0b1c8b
am: e163e7b943

Change-Id: I61a101f50ef6ea56b0ed9b9b1b7ec4b0516220ab