Overlay changes

Change-Id: I9b7b41d72f56392e5697f7b0201ea015948eadf3