More Fixes for unnecessary warnings.

Change-Id: I3f5f02b2567a4999ebdd57ddda5e5d40aa00af28
6 files changed