Fix several compiler warnings.

Change-Id: I55caa50a5937442734f4fcbdb4edf1c70f335bf8
3 files changed