Fix various java warnings

Change-Id: I4c4381e1755831df2c4f41279800fd6af173e4ed
23 files changed