am 0896d8e6: am b49f3460: Merge "Fix alias metadata issues."

* commit '0896d8e6de20740fa46bd761971c8ee4b313b037':
  Fix alias metadata issues.