Fix warnings.

Change-Id: I01dd96da18fe22450bb372b10ba90eab52e29bdf
7 files changed