Merge "Correct string resources for tooltips demo in ApiDemos"