Remove conflicting overlay

Change-Id: Ie7435be93fd08617006b302787fca7a952e46b97