Broken by I1bd2c931, but fortunately already available in the MergeabilityModule so just a matter of moving them around. Change-Id: I68c43d861b3d6d49c4e5e2d933c64dfa0a182be2