More updates to overlay

Change-Id: I929473e461e57dac80694f08e441c3149d727664