Fixed various small bugs found by Findbugs plugin.

Change-Id: I343625bdb9efd2c0ffdfc12f6c0c9119f377041c
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
Merge "Fixed various small bugs found by Findbugs plugin."