Comment out overlays until readded

Change-Id: Id614bd528f97710064a983fd48655894687c154d