Also fixed some other obvious warnings from Eclipse Bug: 16876068 Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff