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

Change-Id: I871c1be785eb63ff213a9d1c540e1ba089e1742a