Overlay updates

Change-Id: If632307dc0f2de13e0036f4cfef9803bbd45c72c