Remove conflicing overlay

Change-Id: I0e214ec3b4e87536981e5fb72d3a6a0425aa6439