Add back missing overlays and other updates

Change-Id: I4cc0b2d40af8970c1076b69c34e035c511a86ef6