am 3570072c: Merge "Use full qualified name in macros."

* commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb':
  Use full qualified name in macros.