Comment out overlays until readded

Change-Id: Iaa443750d2da3a5a0ae826c11ffe7ba16f9fdf8a