Turn off some overlays

Change-Id: I38f54eb7c3b4de8c1ae26796550d0dfa7d5ec28d