Merge "Use the new radio_metadata wrapper for safer memory management." am: f41c781cf4
am: 9ae457ec7b

Change-Id: I94594fc5b65479fb965c4564811526a2fb790a89