Merge "Don't include map name if the consumer doesn't want names." am: e8d1b75c0c
am: 1e352c0768

Change-Id: I712d708100121a48608951201c1ceea0b7212c7e