Overlay and script changes

Change-Id: I8e064de7908cf55da9794e911507589f22d9eb15