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

Change-Id: I47c02409a273dded8562c728dfdf35b1c1b418a0