Remove overlay conflict

Change-Id: Ia885abb45089979d1e8abfa6566b761d21124238