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

Change-Id: I09c0c21f69efb739d73f247e76c3b378a0e5c7d6