Merge "fix sdk build breakage; remove invalid @note tag" into honeycomb