Overlay updates

Change-Id: Ibf2f5e1a7720e50cb9380c2f05d969b55cc254dc