fix some of findbugs issues

Change-Id: I20aa54af16f3a1e3323d735fe53cc26c03d5e52e
7 files changed