Use correct overlays

Change-Id: I293a7862b7f9308489db2afd7afb7cead76f65ae