Clean Up FindBugs and Checkstyle Warnings

Change-Id: I7bdc8393526385979a0a968c1f6a620225668c1f
Signed-off-by: Yasser Aziza <yasser.aziza@gmail.com>
Draft

Signed-off-by: Yasser Aziza <yasser.aziza@mail.com>