aaa: Findbugs fixes

Change-Id: I34674920d96ae447e15b96ccc26009f075e85ca3
topic: AAA
Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com>