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

Change-Id: Iba94e3e82dff749f37ec6643a19cd77875841e7a