Merge "Provide a macro to define a map along with type safe accessors" am: edac9a3cc3
am: 16c3a374df

Change-Id: I3d03b62a650084848e1d30b6cd84523a32d2367b