Add overlay stuffs

Change-Id: I6a0f2a4c5b5f70410e7e82ea5e3022386243621d