am 6f92dbc4: Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb

* commit '6f92dbc49f8ed797bc56e5b84bb897736322ab2d':
  fix sdk build breakage; remove invalid @note tag