Fix warnings.

Change-Id: I4b911e4173da30c164bde7ea50bc80a70fbbb745
7 files changed