Allow fields to be named "map"

Change-Id: I41b089b1e6cc6901a28e36e756881f8c45a96356
2 files changed