Remove some warnings

Change-Id: Ia4064f86a8d97229e006e6537a9e8ed23e2e802f
5 files changed