BUG-731: make sure utility classes are not instantiated

Change-Id: Icdda7afefa3e67c2b3a1b14ad0bbab565963a779
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-731: make sure utility classes are not instantiated"