Add indicator labels

Allows indicators to have tooltips.

Change-Id: I00fe3a078119f2c05c34a22977479b2755b1201c
Merge "Add indicator labels"