Fix warnings.

Change-Id: I9e03d6110d2d9ee5f7cdaa540902e25ddb599ef7
3 files changed