More unnecessary warnings removed.

Change-Id: I1ba703c27fd4fbe3c569bcb307a301a14ac3c829
6 files changed