am f36ae7ca: Merge "Added support for 3GPP meta data atoms"

* commit 'f36ae7ca47dff5a5266f633bb36bf92308eec3f8':
  Added support for 3GPP meta data atoms