Remove conflicting overlays

Change-Id: I75d9329fde65f86be21fb18357c89162a6694e55