Overlay changes

Change-Id: Ifa35253b3d9232cac1815afe03e619a7deff3572