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

Change-Id: I77502bb758f0c90921175159ea52d10a44cc2f3f