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

Change-Id: I53b501fe3460165cbb5dd65b7d4427ca17b2e412