Use generic-aware empty collections

Rather than referring to the instances directly, use the generic-aware
factory methods.

Change-Id: Ie0cdd4b3fdc03da1cf723907d03420bd10c57e45
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Use generic-aware empty collections"