Remove conflicting overlay

Change-Id: I6cb2b94652efae5cc6a9312b0c3df4f4e5652c31