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

* commit 'd3653c90cd7ca7dbfe180d0230067b153abb016b':
  Use full qualified name in macros.