Removing some eclipse warnings

Change-Id: I160feaee81b262be02446885fae643c0be71b7af
18 files changed