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

Change-Id: I7f5391cced1db62be2d9b88823d88d2d77f8b065