Fixed tooltip message keys

Change-Id: I2e0a1e1cc31d1d96a1860475a5b69cf44011c580
Merge "Fixed tooltip message keys"