Merge "Support for @apiNote"
am: 4a67205a2c

* commit '4a67205a2c3b632fdf03f58aaff87b05595f4f0b':
  Support for @apiNote