Don't drown me in warnings.

Change-Id: I43bd95403489fa49d19416dc5e0042490d319140