Needlessly duplicating values in an overlay complicates things when making changes to the code base. Change-Id: I22610fdc82cecf8cee06be8dda61de6bb193b620