Fix dashboard warnings.

Change-Id: I8dfb1ff0b3417134c0df9ae599e350886f6bb521
Merge topic 'dashboard-warnings' into master

3a1216de Fix dashboard warnings.