Clean-up some compiler warning messages.

Change-Id: I24522a57eaabedd4191856b80e5efe1b845be2fd