Fix warnings reported in toaster

Change-Id: I965594edcd686a5e322cd724ef19c969600077b7
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix warnings reported in toaster"