fix 'fill' property for map elements

Change-Id: I193c58b8271dabba8c139a96ea4ed6d56029664a
Merge "fix 'fill' property for map elements"