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

Change-Id: Iaff5d2ba101c08a2b933f38e822c16f26c09ab49