Remove duplicate declarations

Change-Id: I7686eddf2a1135e1dd943d6e5e3965dc4ec74343
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Remove duplicate declarations"