Legacy overlay compatibility

Change-Id: I4ddaa8c6f443f7026f3ed81bab3c0b9e48989616