Do not create Map subclasses

Rather than using subclasses for initialization, which require a serial
version, populate them normally -- thus fixing warnings.

Change-Id: Ia204b3ed6a58acaee1de2f1d780a9421cd0eea8f
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Do not create Map subclasses"