Remove duplicate properties

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