Updated overlay configs

Change-Id: I6b9572ce7a774bbd067944173167325c8bfd9368