Merge "Don't repeat ourselves unnecessarily in the maps." am: 4836ac96 am: 42abc861 am: e345a38f am: 5c065fa6 Change-Id: I3bd544b8790a42a54ea23eb1e48de5505499cb59