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

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